[IA64] Xencomm fixes for HVM PV-drivers

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>

diff --git a/unmodified_drivers/linux-2.6/mkbuildtree b/unmodified_drivers/linux-2.6/mkbuildtree
index 76e228cbe94a90c8f8210236dfd579588d505840..9e2803cd77e5163f5f2334e63e2ab74b6dd109ca 100644 (file)
--- a/unmodified_drivers/linux-2.6/mkbuildtree
+++ b/unmodified_drivers/linux-2.6/mkbuildtree
@@ -19,6 +19,7 @@ mkdir -p include
 mkdir -p include/xen
 mkdir -p include/public
 mkdir -p include/asm
+mkdir -p include/asm/xen
 
 lndir -silent ${XL}/include/xen include/xen
 ln -sf ${XEN}/include/public include/xen/interface
@@ -47,6 +48,10 @@ i[34567]86)
        ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
        ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
        ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
+       ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
+       ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
+       ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci
+       ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci
        ;;
 *)
        echo unknown architecture $uname

diff --git a/unmodified_drivers/linux-2.6/platform-pci/Kbuild b/unmodified_drivers/linux-2.6/platform-pci/Kbuild
index a4c1961a8a2bf8c681d2bda3a382c186d851796c..dda3d0e7cf61d2dab9e4b6e3e79a04b55f280e5f 100644 (file)
--- a/unmodified_drivers/linux-2.6/platform-pci/Kbuild
+++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild
@@ -5,3 +5,8 @@ obj-m := xen-platform-pci.o
 EXTRA_CFLAGS += -I$(M)/platform-pci
 
 xen-platform-pci-objs := evtchn.o platform-pci.o gnttab.o xen_support.o features.o
+
+# Can we do better ?
+ifeq ($(ARCH),ia64)
+  xen-platform-pci-objs += xcom_mini.o xencomm.o
+endif

diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
index 36ad585fbf22cc739ad31170f66240fa564fd540..cb9e8dd7e5a87b3c5fd4e0c5d150c3109b32b316 100644 (file)
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -35,6 +35,9 @@
 #include <asm/hypervisor.h>
 #include <xen/interface/memory.h>
 #include <xen/features.h>
+#ifdef __ia64__
+#include <asm/xen/xencomm.h>
+#endif
 
 #include "platform-pci.h"
 
@@ -59,6 +62,10 @@ static int __init init_xen_info(void)
        struct xen_add_to_physmap xatp;
        extern void *shared_info_area;
 
+#ifdef __ia64__
+       xencomm_init();
+#endif
+
        setup_xen_features();
 
        shared_info_frame = alloc_xen_mmio(PAGE_SIZE) >> PAGE_SHIFT;